Remove unecessary caching