Added cache to test settings
Merged changes from master