Merge pull request #3804 from refringe/feature/cache-defaults

Cache Library Clean-up