Preparing for cache implementation