Cleaned up the cache code a bit still needs more work though