Merge "Clean up Renderengine caching semantics"