Introduced DiskCache and MemoryCache interfaces instead of deprecated DiscCacheAware and MemoryCacheAware.
 Preparing for global renaming "disc" -> "disk". Renamed in java docs and variables, deprecated "disc" API.
Sample: Use "disk" API