refactored caching part to hopefully not core anymore
refactored caching part to hopefully not core anymore

zer0infinity/CuteTestForCoastTest,zer0infinity/CuteTestForCoastTest,zer0infinity/CuteTestForCoastTest,zer0infinity/CuteTestForCoastTest,zer0infinity/CuteTestForCoastTest