Added layer caching