GL caches refactoring