Continued work on Local caching