Improved Cache Handling