Cache is now working correctly as well as loading by filename