Cache Intercepton Fixes