Cache fixes

Please review changes