Fix for cache on page manager