Some tweaks for caching and some bug fixes?